Merge "Add index on rc_this_oldid"

[lhc/web/wiklou.git] / includes / installer / MysqlUpdater.php

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 3e1d196..408f2fb 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -367,6 +367,7 @@ class MysqlUpdater extends DatabaseUpdater {
                                'patch-protected_titles-fix-pk.sql' ],
                        [ 'renameIndex', 'site_identifiers', 'site_ids_type', 'PRIMARY', false,
                                'patch-site_identifiers-fix-pk.sql' ],
+                       [ 'addIndex', 'recentchanges', 'rc_this_oldid', 'patch-recentchanges-rc_this_oldid-index.sql' ],
                ];
        }
 
@@ -756,8 +757,9 @@ class MysqlUpdater extends DatabaseUpdater {
                        'Converting links and brokenlinks tables to pagelinks'
                );
 
-               global $wgContLang;
-               foreach ( $wgContLang->getNamespaces() as $ns => $name ) {
+               foreach (
+                       MediaWikiServices::getInstance()->getContentLanguage()->getNamespaces() as $ns => $name
+               ) {
                        if ( $ns == 0 ) {
                                continue;
                        }
@@ -1231,7 +1233,7 @@ class MysqlUpdater extends DatabaseUpdater {
                                'Extending edit summary lengths (and setting defaults)'
                        );
                } else {
-                       $this->output( '...comment fields are up to date' );
+                       $this->output( "...comment fields are up to date.\n" );
                }
        }